User/beenachauhan/wsladiag localization support #13997

beena352 · 2025-12-29T17:46:37Z

Summary of the Pull Request

Adds localization support to wsladiag by replacing all hardcoded user-facing strings with localized messages from Resources.resw. All messages (usage, errors, session list output) are now accessible via the Localization class.

PR Checklist

Closes: Link to issue #xxx
Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
[x ] Tests: Added/updated if needed and all pass
[x ] Localization: All end user facing strings can be localized
Dev docs: Added/updated if needed
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Added 11 new localization entries to [Resources.resw] for wsladiag-specific messages
Updated [wsladiag.cpp] to use [Localization::MessageWslaXxx()] for all user-facing output including:
Usage information
Session not found / open session failed errors
Session list output (headers, no sessions message, session count)
Shell exit status messages
Unknown command errors
Added [using wsl::shared::Localization;]declaration following existing codebase patterns
All existing WsladiagTests pass (8/8 tests validate localized message output)

Validation Steps Performed

Built project successfully with cmake --build build-vs-x64 --config Debug --parallel
Ran all wsladiag tests: [bin\x64\debug\test.bat /name:WsladiagTests]- All 8 tests passed
Manually tested commands:
[wsladiag.exe --help] - displays localized usage
wsladiag.exe list - displays localized session list or "No WSLA sessions found"
wsladiag.exe shell InvalidSession - displays localized error "Session not found: 'InvalidSession'"
wsladiag.exe badcommand - displays localized "Unknown command: 'badcommand'" error

benhillis

I think we will want to add WSLA strings to a different .resw file. Otherwise we will have localized strings in both products that do not need to be present.

OneBlue · 2025-12-31T22:05:25Z

I think we will want to add WSLA strings to a different .resw file. Otherwise we will have localized strings in both products that do not need to be present.

We might be able to get away with it either by relying on the fact that the localization methods are inline, and so the compiler should eliminate the strings that aren't used, or by having a special prefix for WSLA strings so the localization script can generate two separate headers.

Either way, that's something that would be ok to do in a followup PR IMO

Copilot

Pull request overview

This pull request adds comprehensive localization support to the wsladiag diagnostics tool by replacing all hardcoded user-facing strings with localized messages from Resources.resw. The changes ensure that error messages, usage information, and session listing output can be properly localized for international users.

Key Changes

Replaced hardcoded strings with 11 new localization entries for wsladiag-specific messages
Refactored usage information to use PrintUsage() function with localized message
Updated error handling to use consistent localization API patterns
Improved table formatting to properly handle localized column headers with dynamic width calculation

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
src/windows/wsladiag/wsladiag.cpp	Replaced all hardcoded user-facing strings with Localization API calls; added using declarations; renamed variable from 'code' to 'exitCode' for clarity; changed ErrorCodeToString to GetErrorString; improved table formatting logic
localization/strings/en-US/Resources.resw	Added 11 new message entries (MessageWsladiagUsage, MessageWslaSessionNotFound, MessageWslaOpenSessionFailed, MessageWslaNoSessionsFound, MessageWslaSessionsFound, MessageWslaShellExited, MessageWslaShellSignalled, MessageWslaHeaderId, MessageWslaHeaderCreatorPid, MessageWslaHeaderDisplayName, MessageWslaUnknownCommand) with appropriate localization annotations

localization/strings/en-US/Resources.resw

Copilot · 2026-01-01T20:22:10Z

src/windows/wsladiag/wsladiag.cpp

-    wslutil::PrintMessage(std::format(L"Found {} WSLA session{}:", sessions.size(), sessions.size() > 1 ? L"s" : L""), stdout);
+    wslutil::PrintMessage(Localization::MessageWslaSessionsFound(sessions.size()), stdout);
+
+    // Compute column widths from headers + data .


There is an extra space before the period in this comment. It should be "headers + data." instead of "headers + data ."

Suggested change

// Compute column widths from headers + data .

// Compute column widths from headers + data.

benhillis · 2026-01-05T18:47:32Z

I think we will want to add WSLA strings to a different .resw file. Otherwise we will have localized strings in both products that do not need to be present.

We might be able to get away with it either by relying on the fact that the localization methods are inline, and so the compiler should eliminate the strings that aren't used, or by having a special prefix for WSLA strings so the localization script can generate two separate headers.

Either way, that's something that would be ok to do in a followup PR IMO

Ah all of the languages strings are embedded in the binaries themselves? Then yeah, this is probably ok.

OneBlue

LGTM ! Thank you for doing this.

benhillis

I think copilot identified something real

beena352 · 2026-01-06T23:11:14Z

I think copilot identified something real

Thanks for the heads-up! If you can point me to what Copilot flagged, I’ll take a look.

benhillis · 2026-01-07T17:52:06Z

@beena352 there are comments in this PR with copilots findings.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

Copilot · 2026-01-07T17:56:02Z

src/windows/wsladiag/wsladiag.cpp


 using namespace wsl::shared;
 namespace wslutil = wsl::windows::common::wslutil;
+using wsl::shared::Localization;


The using wsl::shared::Localization; declaration is redundant since using namespace wsl::shared; on line 24 already brings the Localization class into scope. This can be removed for clarity.

Suggested change

using wsl::shared::Localization;

Copilot · 2026-01-07T17:56:02Z

src/windows/wsladiag/wsladiag.cpp

+using wsl::windows::common::Context;
+using wsl::windows::common::ExecutionContext;


The using declarations for Context and ExecutionContext are added but these types do not appear to be used anywhere in this file. These should be removed unless they are actually needed.

Suggested change

using wsl::windows::common::Context;

using wsl::windows::common::ExecutionContext;

Copilot · 2026-01-07T17:56:02Z

localization/strings/en-US/Resources.resw

+  <value>No WSLA sessions found.</value>
+</data>
+<data name="MessageWslaSessionsFound" xml:space="preserve">
+  <value>Found {} WSLA session(s):</value>


The localized message always includes "(s)" regardless of the count, which changes the output behavior from the original code. The original code conditionally added "s" only when sessions.size() > 1, producing "Found 1 WSLA session:" or "Found 2 WSLA sessions:". The new version will always show "Found 1 WSLA session(s):" which is less grammatically natural. Consider using the conditional plural pattern to maintain the original behavior, or verify that this change is intentional.

Suggested change

<value>Found {} WSLA session(s):</value>

<value>Found {} WSLA session{}:</value>

…nused lambda

beena352 · 2026-01-07T23:20:25Z

@beena352 there are comments in this PR with copilots findings.

Thanks! I picked up the Copilot suggestions that fit the current scope.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Copilot · 2026-01-07T23:34:31Z

localization/strings/en-US/Resources.resw

+<data name="MessageWslaSessionNotFound" xml:space="preserve">
+  <value>Session not found: '{}'</value>
+  <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+</data>
+<data name="MessageWslaOpenSessionFailed" xml:space="preserve">
+  <value>OpenSessionByName('{}') failed</value>
+  <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+</data>
+<data name="MessageWslaNoSessionsFound" xml:space="preserve">
+  <value>No WSLA sessions found.</value>
+</data>
+<data name="MessageWslaSessionsFound" xml:space="preserve">
+  <value>Found {} WSLA session{}:</value>
+  <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+</data>
+<data name="MessageWslaShellExited" xml:space="preserve">
+  <value>{} exited with: {}</value>
+  <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+</data>
+<data name="MessageWslaShellSignalled" xml:space="preserve">
+  <value> (signalled)</value>
+</data>
+<data name="MessageWslaHeaderId" xml:space="preserve">
+  <value>ID</value>
+</data>
+<data name="MessageWslaHeaderCreatorPid" xml:space="preserve">
+  <value>Creator PID</value>
+</data>
+<data name="MessageWslaHeaderDisplayName" xml:space="preserve">
+  <value>Display Name</value>
+</data>
+<data name="MessageWslaUnknownCommand" xml:space="preserve">
+  <value>Unknown command: '{}'</value>
+  <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+</data>


Inconsistent indentation: The data elements starting from line 1882 onwards are missing the standard 2-space indentation used throughout the rest of the file. All data tags should be indented with 2 spaces to match the existing formatting convention.

Suggested change

<data name="MessageWslaSessionNotFound" xml:space="preserve">

<value>Session not found: '{}'</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaOpenSessionFailed" xml:space="preserve">

<value>OpenSessionByName('{}') failed</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaNoSessionsFound" xml:space="preserve">

<value>No WSLA sessions found.</value>

</data>

<data name="MessageWslaSessionsFound" xml:space="preserve">

<value>Found {} WSLA session{}:</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaShellExited" xml:space="preserve">

<value>{} exited with: {}</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaShellSignalled" xml:space="preserve">

<value> (signalled)</value>

</data>

<data name="MessageWslaHeaderId" xml:space="preserve">

<value>ID</value>

</data>

<data name="MessageWslaHeaderCreatorPid" xml:space="preserve">

<value>Creator PID</value>

</data>

<data name="MessageWslaHeaderDisplayName" xml:space="preserve">

<value>Display Name</value>

</data>

<data name="MessageWslaUnknownCommand" xml:space="preserve">

<value>Unknown command: '{}'</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaSessionNotFound" xml:space="preserve">

<value>Session not found: '{}'</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaOpenSessionFailed" xml:space="preserve">

<value>OpenSessionByName('{}') failed</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaNoSessionsFound" xml:space="preserve">

<value>No WSLA sessions found.</value>

</data>

<data name="MessageWslaSessionsFound" xml:space="preserve">

<value>Found {} WSLA session{}:</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaShellExited" xml:space="preserve">

<value>{} exited with: {}</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

<data name="MessageWslaShellSignalled" xml:space="preserve">

<value> (signalled)</value>

</data>

<data name="MessageWslaHeaderId" xml:space="preserve">

<value>ID</value>

</data>

<data name="MessageWslaHeaderCreatorPid" xml:space="preserve">

<value>Creator PID</value>

</data>

<data name="MessageWslaHeaderDisplayName" xml:space="preserve">

<value>Display Name</value>

</data>

<data name="MessageWslaUnknownCommand" xml:space="preserve">

<value>Unknown command: '{}'</value>

<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

</data>

…esources

beena352 force-pushed the user/beenachauhan/wsladiag-localization-support branch from ddebff2 to 1107c6a Compare December 30, 2025 21:28

benhillis requested changes Dec 31, 2025

View reviewed changes

beena352 marked this pull request as ready for review January 1, 2026 20:18

beena352 requested a review from a team as a code owner January 1, 2026 20:18

Copilot AI review requested due to automatic review settings January 1, 2026 20:18

Copilot started reviewing on behalf of beena352 January 1, 2026 20:19 View session

Copilot AI reviewed Jan 1, 2026

View reviewed changes

beena352 force-pushed the user/beenachauhan/wsladiag-localization-support branch from 46dfad2 to 57c5c1d Compare January 2, 2026 19:56

beena352 force-pushed the user/beenachauhan/wsladiag-localization-support branch from 57c5c1d to 89db2ad Compare January 5, 2026 23:35

OneBlue approved these changes Jan 6, 2026

View reviewed changes

benhillis self-requested a review January 6, 2026 00:27

benhillis requested changes Jan 6, 2026

View reviewed changes

beena352 force-pushed the user/beenachauhan/wsladiag-localization-support branch from 89db2ad to 846648e Compare January 6, 2026 23:01

benhillis requested a review from Copilot January 7, 2026 17:51

Copilot started reviewing on behalf of benhillis January 7, 2026 17:52 View session

Copilot AI reviewed Jan 7, 2026

View reviewed changes

beena352 force-pushed the user/beenachauhan/wsladiag-localization-support branch from 846648e to f08bf3a Compare January 7, 2026 17:59

beena352 added 5 commits January 7, 2026 14:41

Localize wsladiag user-facing messages

a270160

Localize wsladiag messages and fix list output formatting

817b029

Fix undefined variable

abf097a

Apply Copilot suggestions

7978c7f

Restore correct locked token for wsladiag usage localization

ec16460

beena352 force-pushed the user/beenachauhan/wsladiag-localization-support branch from f08bf3a to ec16460 Compare January 7, 2026 22:42

wsladiag: localize output messages, implement pluralization, remove u…

c17bf82

…nused lambda

benhillis self-requested a review January 7, 2026 23:29

benhillis requested a review from Copilot January 7, 2026 23:29

Copilot started reviewing on behalf of benhillis January 7, 2026 23:30 View session

Copilot AI reviewed Jan 7, 2026

View reviewed changes

benhillis approved these changes Jan 7, 2026

View reviewed changes

localization: fix indentation and placeholder comments for wsladiag r…

bd7b792

…esources

beena352 merged commit 0665546 into microsoft:feature/wsl-for-apps Jan 8, 2026
6 checks passed

	// Compute column widths from headers + data .
	// Compute column widths from headers + data.

		using wsl::windows::common::Context;
		using wsl::windows::common::ExecutionContext;

	<value>Found {} WSLA session(s):</value>
	<value>Found {} WSLA session{}:</value>

User/beenachauhan/wsladiag localization support #13997

User/beenachauhan/wsladiag localization support #13997

Conversation

beena352 commented Dec 29, 2025

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

benhillis left a comment

Choose a reason for hiding this comment

Uh oh!

OneBlue commented Dec 31, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Jan 1, 2026

Choose a reason for hiding this comment

Uh oh!

benhillis commented Jan 5, 2026

Uh oh!

OneBlue left a comment

Choose a reason for hiding this comment

Uh oh!

benhillis left a comment

Choose a reason for hiding this comment

Uh oh!

beena352 commented Jan 6, 2026

Uh oh!

benhillis commented Jan 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

beena352 commented Jan 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants